From d45d58a3f14fb139e76d39aaab962fc2b4f49629 Mon Sep 17 00:00:00 2001 From: "robertlipe@gmail.com" Date: Mon, 3 Mar 2014 00:01:13 +0000 Subject: [PATCH] Bump version. Attemps to fix deployment issues on Windows. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4767 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/configure | 18 ++-- gpsbabel/configure.in | 2 +- gpsbabel/gbversion.h | 2 +- gpsbabel/gui/makesetup.bat | 5 +- gpsbabel/gui/setup.iss | 170 ++++++++++++++++++------------------- 5 files changed, 100 insertions(+), 97 deletions(-) diff --git a/gpsbabel/configure b/gpsbabel/configure index a897abae0..41d73a253 100755 --- a/gpsbabel/configure +++ b/gpsbabel/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GPSBabel 1.5.0-beta20140214. +# Generated by GNU Autoconf 2.69 for GPSBabel 1.5.0-beta20140302. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GPSBabel' PACKAGE_TARNAME='gpsbabel' -PACKAGE_VERSION='1.5.0-beta20140214' -PACKAGE_STRING='GPSBabel 1.5.0-beta20140214' +PACKAGE_VERSION='1.5.0-beta20140302' +PACKAGE_STRING='GPSBabel 1.5.0-beta20140302' PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS' PACKAGE_URL='' @@ -1283,7 +1283,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GPSBabel 1.5.0-beta20140214 to adapt to many kinds of systems. +\`configure' configures GPSBabel 1.5.0-beta20140302 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1349,7 +1349,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GPSBabel 1.5.0-beta20140214:";; + short | recursive ) echo "Configuration of GPSBabel 1.5.0-beta20140302:";; esac cat <<\_ACEOF @@ -1449,7 +1449,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GPSBabel configure 1.5.0-beta20140214 +GPSBabel configure 1.5.0-beta20140302 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1765,7 +1765,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GPSBabel $as_me 1.5.0-beta20140214, which was +It was created by GPSBabel $as_me 1.5.0-beta20140302, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -5475,7 +5475,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GPSBabel $as_me 1.5.0-beta20140214, which was +This file was extended by GPSBabel $as_me 1.5.0-beta20140302, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5537,7 +5537,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GPSBabel config.status 1.5.0-beta20140214 +GPSBabel config.status 1.5.0-beta20140302 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/gpsbabel/configure.in b/gpsbabel/configure.in index 9f8b293f9..b6fa40715 100644 --- a/gpsbabel/configure.in +++ b/gpsbabel/configure.in @@ -6,7 +6,7 @@ AC_PREREQ(2.59) #AC_INIT(GPSBabel, 1.4.4, BUG-REPORT-ADDRESS) #DOCVERSION=1.4.4 #PACKAGE_RELEASE= -AC_INIT(GPSBabel, 1.5.0-beta20140214, BUG-REPORT-ADDRESS) +AC_INIT(GPSBabel, 1.5.0-beta20140302, BUG-REPORT-ADDRESS) # YYYYMMDD, please, if beta, i.e. "-beta20060413" DOCVERSION=development diff --git a/gpsbabel/gbversion.h b/gpsbabel/gbversion.h index 6f5d228f6..4878d907f 100644 --- a/gpsbabel/gbversion.h +++ b/gpsbabel/gbversion.h @@ -4,5 +4,5 @@ * * Isn't simplification via automation grand? */ -#define VERSION "1.5.0-beta20140214" +#define VERSION "1.5.0-beta20140302" #define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-development" diff --git a/gpsbabel/gui/makesetup.bat b/gpsbabel/gui/makesetup.bat index ebe3039ef..8da542db2 100644 --- a/gpsbabel/gui/makesetup.bat +++ b/gpsbabel/gui/makesetup.bat @@ -24,8 +24,11 @@ copy %QTDIR%\bin\Qt5Webkit.dll qtdir\bin copy %QTDIR%\bin\Qt5Xml.dll qtdir\bin copy %QTDIR%\bin\Qt5Network.dll qtdir\bin rem copy %QTDIR%\bin\mingwm10.dll qtdir\bin +# Because *obviously* libraries should live in the bin directory... +copy %QTDIR%\bin\libwinpthread*.dll qtdir\bin +copy %QTDIR%\bin\libgicu*.dll qtdir\bin +copy %QTDIR%\bin\libgstdc++*.dll qtdir\bin copy %QTDIR%\bin\libgcc_s_dw2-1.dll qtdir\bin -rem copy %QTDIR%\bin\phonon.dll qtdir\bin rem Image format plugins needed at runtime, but not debug verions xcopy %QTDIR%\plugins\imageformats qtdir\plugins\imageformats diff --git a/gpsbabel/gui/setup.iss b/gpsbabel/gui/setup.iss index 6dacfe062..b4530ef8d 100755 --- a/gpsbabel/gui/setup.iss +++ b/gpsbabel/gui/setup.iss @@ -1,85 +1,85 @@ -; -; NOTE: setup.iss is generated from setup.iss.in via autoconf. -; The generated setup.iss is checked in to help keep the version numbers -; synchronized. -; -; Script for generating installation setup program for GPSBabel -; Uses the Inno setup compiler. Typically used from the command -; line "makesetup.bat" which copies QT system files which -; the Innosetup compiler cannot handle. -; -; So it is not a good idea to run this file from the Inno Setup GUI. - -[Setup] -; NOTE: The value of AppId uniquely identifies this application. -; Do not use the same AppId value in installers for other applications. -; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -AppId={{1B8FE958-A304-4902-BF7A-4E2F0F5B7017} -AppName=GPSBabel -AppVerName=GPSBabel 1.5.0-beta20140214 -AppPublisher=GPSBabel -AppPublisherURL=http://www.gpsbabel.org -AppSupportURL=http://www.gpsbabel.org -AppUpdatesURL=http://www.gpsbabel.org -DefaultDirName={pf}\GPSBabel -DefaultGroupName=GPSBabel -OutputDir=release -OutputBaseFilename=GPSBabel-1.5.0-beta20140214-Setup -SetupIconFile=images\babel2.ico -Compression=lzma -SolidCompression=yes -LicenseFile=COPYING.txt - -[Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" - -[Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked - -[Files] -; This isn't as wreckless as it seems; these directories are populated on a -; controlled way by the batch file. -Source: qtdir\bin\*.dll; DestDir: "{app}"; Flags: ignoreversion -Source: qtdir\plugins\*; DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs - -Source: gmapbase.html; DestDir: "{app}"; Flags: ignoreversion -Source: qt.conf; DestDir: "{app}"; Flags: ignoreversion - -Source: \gpsbabel\gui\release\gpsbabelfe.exe; DestDir: "{app}"; Flags: ignoreversion -;Source: release\libexpat.dll; DestDir: "{app}"; Flags: ignoreversion -Source: \gpsbabel\gpsbabel\release\gpsbabel.exe; DestDir: "{app}"; Flags: ignoreversion -; Source: release\help\*; DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs - -; Translation strings extracted from source code. Include it in the dist -; so that users can translate if they want to. -; Source: gpsbabel_*.ts; DestDir: "{app}\translations"; Flags: ignoreversion -; Source: gpsbabelfe_*.ts; DestDir: "{app}\translations"; Flags: ignoreversion - -; Compiled translation strings that are used at runtime. -; Source: gpsbabel_*.qm; DestDir: "{app}\translations"; Flags: ignoreversion -Source: gpsbabelfe*.qm; DestDir: "{app}\translations"; Flags: ignoreversion - -; Now translations from Qt's own UI stuff. -Source: qtdir\translations\*; DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs - -; Miscellaneous -Source: COPYING.txt; DestDir: {app}; Flags: ignoreversion -; Source: AUTHORS; DestDir: {app}; Flags: ignoreversion -; Source: README.contrib; DestDir: {app}; Flags: ignoreversion -; Source: README.gui; DestDir: {app}; Flags: ignoreversion - - -; NOTE: Don't use "Flags: ignoreversion" on any shared system files - -[Icons] -Name: "{group}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe" -Name: "{commondesktop}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe"; Tasks: desktopicon - -[Run] -Filename: "{app}\gpsbabelfe.exe"; Description: "{cm:LaunchProgram,GPSBabelFE}"; Flags: nowait postinstall skipifsilent - -[Registry] -Root: HKCU; Subkey: "Software\GPSBabel"; Flags: uninsdeletekeyifempty -Root: HKCU; Subkey: "Software\GPSBabel\GPSBabel"; Flags: uninsdeletekey -Root: HKCU; Subkey: "Software\GPSBabel\GPSBabelFE"; Flags: uninsdeletekey - +; +; NOTE: setup.iss is generated from setup.iss.in via autoconf. +; The generated setup.iss is checked in to help keep the version numbers +; synchronized. +; +; Script for generating installation setup program for GPSBabel +; Uses the Inno setup compiler. Typically used from the command +; line "makesetup.bat" which copies QT system files which +; the Innosetup compiler cannot handle. +; +; So it is not a good idea to run this file from the Inno Setup GUI. + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. +; Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) +AppId={{1B8FE958-A304-4902-BF7A-4E2F0F5B7017} +AppName=GPSBabel +AppVerName=GPSBabel 1.5.0-beta20140214 +AppPublisher=GPSBabel +AppPublisherURL=http://www.gpsbabel.org +AppSupportURL=http://www.gpsbabel.org +AppUpdatesURL=http://www.gpsbabel.org +DefaultDirName={pf}\GPSBabel +DefaultGroupName=GPSBabel +OutputDir=release +OutputBaseFilename=GPSBabel-1.5.0-beta20140214-Setup +SetupIconFile=images\babel2.ico +Compression=lzma +SolidCompression=yes +LicenseFile=COPYING.txt + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked + +[Files] +; This isn't as wreckless as it seems; these directories are populated on a +; controlled way by the batch file. +Source: qtdir\bin\*.dll; DestDir: "{app}"; Flags: ignoreversion +Source: qtdir\plugins\*; DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs + +Source: gmapbase.html; DestDir: "{app}"; Flags: ignoreversion +Source: qt.conf; DestDir: "{app}"; Flags: ignoreversion + +Source: \gpsbabel\gui\release\gpsbabelfe.exe; DestDir: "{app}"; Flags: ignoreversion +;Source: release\libexpat.dll; DestDir: "{app}"; Flags: ignoreversion +Source: \gpsbabel\gpsbabel\release\gpsbabel.exe; DestDir: "{app}"; Flags: ignoreversion +; Source: release\help\*; DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs + +; Translation strings extracted from source code. Include it in the dist +; so that users can translate if they want to. +; Source: gpsbabel_*.ts; DestDir: "{app}\translations"; Flags: ignoreversion +; Source: gpsbabelfe_*.ts; DestDir: "{app}\translations"; Flags: ignoreversion + +; Compiled translation strings that are used at runtime. +; Source: gpsbabel_*.qm; DestDir: "{app}\translations"; Flags: ignoreversion +Source: gpsbabelfe*.qm; DestDir: "{app}\translations"; Flags: ignoreversion + +; Now translations from Qt's own UI stuff. +Source: qtdir\translations\*; DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs + +; Miscellaneous +Source: COPYING.txt; DestDir: {app}; Flags: ignoreversion +; Source: AUTHORS; DestDir: {app}; Flags: ignoreversion +; Source: README.contrib; DestDir: {app}; Flags: ignoreversion +; Source: README.gui; DestDir: {app}; Flags: ignoreversion + + +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Icons] +Name: "{group}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe" +Name: "{commondesktop}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe"; Tasks: desktopicon + +[Run] +Filename: "{app}\gpsbabelfe.exe"; Description: "{cm:LaunchProgram,GPSBabelFE}"; Flags: nowait postinstall skipifsilent + +[Registry] +Root: HKCU; Subkey: "Software\GPSBabel"; Flags: uninsdeletekeyifempty +Root: HKCU; Subkey: "Software\GPSBabel\GPSBabel"; Flags: uninsdeletekey +Root: HKCU; Subkey: "Software\GPSBabel\GPSBabelFE"; Flags: uninsdeletekey + -- 2.30.2